Fix to InputCommands. Needs additional safety fix.

Signed-off-by: Man_cub <mcmancub@gmail.com>