Fix custom checkbox scoping