This commit fixes #2