Fix bug from #38