Fixed waatch position bug