Fixes #1736