Fixes #272