Fix for ESBJAVA3340