Bugfix for #643 - Initial timeline created with wrong data