Fixed checkbox handling.