Fix backspace issues