close #183 (formerly 168/169) (codefix by @ligu)