related to issue #33