issue #238 done