Reorder vars to avoid compilation warning