Implement patch suggested at https://github.com/chriskite/anemone/issues/49