Fix touch tracking bug