Checkbox persistance fix