core collection fix