fixes #1825