Fix position ordering