Related to issue #97