fixes #1811