fixes #1718
fixes #1689