GitHub issue #133