Fix find_command not returning command