Temporary solution for orientation problem