fix #92 again