True. This should be fixed all over the codebase at some point.