Fix checkbox support