Attempting to solve issue #189