Fixing ESBJAVA-3245