fix with logic on reorder