related to issue #18