Etap battery clip breaking

[guylrc]

Wanted to ask if anyone else has had troubles with their e-tap battery where the black clip breaks off. I have had two break in the last three months. The first was on the start line at Kilarney, then yesterday 60 kilometers into a race (where the rear derailleur had been working fine till that point) I could not change gears. I thought the battery was flat but after stopping could see the clip had broken off in the rear derailleur whilst riding, and it feel out when removing the battery. A few people commented at the finish they had had the same problem so I suspect a faulty batch? If so please post as this is a very frustrating occurrence and I hope the manufacturer will back their agent in swopping out trouble free faulty batteries.