Fixing options framework