[RFR] Fix checkbox field