fixes #1699