Fixing keyboard bugs; try this now