Fix for https://issues.apache.org/jira/browse/AMQ-4825