Fix for AMQ-4899