patched to allow global configuration to override