bug fix 4285

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

bug fix 4285