trying to wrap up Issue #1729