More Offset Fixing

More Offset Fixing