Attempted 'fix' of touch bug