#37 and #38 fix

What exactly is happening in here?