Fix for checkbox