This commit fixes #16