Fixes #79