Github issue #189