Feature/issue 1728

Addresses issue #1728