9993 fix develop

PR #200 rebased to develop, fixing issue in ticket 9993