Fix hybrid again