fix #20 again