bug fix 4249

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