Fix custom checkbox scoping
Merge pull request #3449 from jarsbe/master

Fix custom checkbox scoping