fixing the defetc ESBJAVA-3031