Add another workaround for get_by_guid problem