Fixing ESBJAVA-3380