WIP: addressing issue #70