Better fix for multiple images/timeline