issue #937 done