Yeah, we should figure this out. This shouldn't be necessary (or at least should be consistent).