Fix for issue #189