Fixed issue with orientation