Fix Keyboard Issue v 2.6