close #11 and #21