Fixed a bug related to the checkboxes beeing able to enable eachother
Merge