Added fix for quick setOrientation calls