Fixes #655. Also fixes setVisible(false) for 2D controls.
Merge pull request #672 from kwhatmough/next

Fixes #655. Also fixes setVisible(false) for 2D controls.