added two flags to close #1