fixes #1809