Workaround for index out of bound issue in touch handler
Merge remote-tracking branch 'origin/master'