Fixing ESBJAVA-3010.