Timeline bug fix