Fixing touch issues on PB