fixes order bug
merge