issue #225 done