Fixed: Timeline working not correctly