Fixed UpdatePosition calculations