Fix turn behavior