addressing issue #83