issue #297 done