fixing position WIP
Merge commit 'f80d918d86892a70ce6a002a4fb396c488e4eb10'