Re #1: fix change orientation