#33 issue fixed