That should do the trick for touch devices, closes #18