Fix for Checkbox