Final Fix For Orientation