Fixed annoying checkbox issue