Fixes #7 (Checkbox issue)