Fix GitHub issue #40