+ Apply patch for helix but deactivate it for the moment