Add fix for combo one-offs