hotfix related to shoot and turn