A nice try to fix issue #189