#228 works for touch but need to address onur's comment