9712f3d fixes #153 and #154 major regressions on modal and checkbox