fixing returns from get_puppet_*