Fix bug on arrow always show
Merge branch 'master' into dev