Fixed Add Group Function