Thread safe fix on touch events