This commit fixes #1