fixes #1861
fixes #1858