related to issue #59