See #339 - would be good to add this to our test suite
See #339 - would be good to add this to our test suite