Fix ctrl-b and ctrl-f