timeline label bugfix
merge