Fix and test #38