Fix for multiple key stroke