CMS-2900 reverted the solution and implemented another solution.
CMS-2900 Moved position fix to callback function.