Fixed a crash on multitouch
merge
bigger merge