This commit fixes #3