Add a spec for issue #2124 (I think)