Fixed #33: Fixed position issue after rotation, need to be tested