Fix variable order