issue #66 fix

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