address issue #66