fixing timeline crashes