Preliminary fix and test for Issue #47

(Should look more at Stem for things like this, probably...)