added new hack for orientation change