Maybe fixed issue where kyboard popped up sometimes