Fixed to use original message for non-override scenario.