Fix regression in keyboard operation caused by new runtime model