fix a backwards compatibility issue; add test for it