Fix squashed controls bug