fix(*): Closes #83 - position issue while swapping