#37 and #38 fix

` = `