Fix the collection before fill and after fill