Fixes #2
Merge branch 'hotfix-last-typed-not-show-up' into develop