Fixed turn issues