Fixes #143

Done