Fixing issue #189.