fix #16 again