fix to issue #9