Related to issue #111