fix #26 again