Possible fix for #14; hard to test.