Touch fixes #41