#21 issue fixed