appears to close #27