Attempting to fix #38