mh, sounds like we should test both paths?