[fix] Timeline Bugs