Fixing offset classes