#37 and #38 fix

spaces around equals