Fixing Orientation Fit