Fed up with Riva batteries breaking!