try to fix #189 without causing other problems