#37 and #38 fix

nit: typo - clena