Fix for #38