Reset order bug fix