[#113] Ensure orientation is maintained

* If the orientation is not the same, manually fix it