added ordering to possibly fix weird bug