Fixed issue for touch devices