#37 and #38 fix

:+1: