This commit fixes #22