fix #220 again