fix #1 again