Fixes #189, using general method from now on.