try to fix #38