This should fix #38