related to issue #23