Fix for ESBJAVA-3433