fix #7 again