fix handling of 'extra' set