Switching argument order to reduce warnings