Fixed turning issues created by previous commits