Fix vars order bug