fix #38 again