Make controls = false work as expected

fixes #467 and #446