fix variable order