Fix issue with CHECKBOX_TYPE