bug fix 4285

Signed-off-by: Sampath Liyanage <plbsam@gmail.com>