GitHub issue #14 fix