bug fix 4286

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

bug fix 4286