Replaced $CurrentPosition by $PositionCurrent