Fix timeline bug
Merge pull request #297 from liuchuangww/user

Fix timeline bug