GitHub issue #4 fix