Try to fix #189 again.