added fix for timeline