fix collapse set