Add gesture fix from Bernhard