Fixes #1811