Incomplete fix of touch management bug (highlights core issue)