belt-and-suspenders on justify bug; add tests for it