fix bug in timeline view
merge with Ivan's last commit