Changed order to be consistent with rest of the function