Fixes gh-119