FIX: touch events bugs