Attempting fix for touch issues as per http://goo.gl/paFZ6v