#26 issue fixed