[In progress: 4] Touch fix