Feature/issue 109

resolve one manifestation of issue #109