bug fix 4334

Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
Merge pull request #1084 from sampathLiyanage/bugfix4334

bug fix 4334