Fix for #189