This commit fixes #7