Final addition to Issue #189