Fixing #189