Re #934. Added a unit test