Fix variables order