try to fix #38, try 2