Back to vertical orientation, fix out-of-bounds-error