Fixes #105