Tried to make checkbox behaviour more consistent