addressing issue #58