[WIP] couldn't input 4???
Fix cannot input 4 & 7 by workaround
Merge branch 'update-vital-over'