Fixes #273