Fixed #189