Fix orphan timeline