Fixes #1756