This seems to change some order of operations, do we know if this is safe? (If not, we'll need to double check by tracing this method)