Untested fix to make checkboxen work as they should.