Finish turn bug fix