DiffContainer fix