Removing 1-parameter check