Fix GitHub issue 8