Added fix for backspace