fix to issue #158