Position bug fix