This commit fixes #116