#235 fixed bug in order