timeline bugfix