find_commands(): fixed