Fix checkboxes remaining checked in some cases

Submitted by:	gustau.perez@gmail.com
Fixes:		[bd617189be07]