WIP Fix modification collection.