Fix controls

Issue #13