Properly fix timeline