Fix for position. See test in commit 77a951bb14f123dcfe9e689de521d9eb7f024d0e