TASK-35: Clean hack for send position event