Added failing test for changes made in aa47ad19124ce9946fc6fc02e6958a5c23601992.
And added a fix for aa47ad19124ce9946fc6fc02e6958a5c23601992, so the new test passes. Thanks, Ben.