This commit fixes #118