small bug with data-order fixed