fixed checkbox handling