Migration queue fix