Patch given for ESBJAVA-2988

Applied the patch given by Isuru Gunawardana