Fixes #118