fix #2 again