address issue #59