Check-boxes fixed