Fixes #1745