Fix kb handler (useless fix tho..)