Fixed small remote/keyboard bug