Yet another attempt to fix #38