Checkbox fix manually applied