fixed but order is off