another attempt to close #178