Fix bug when first param was not a zset. Pumped up to v11