Fixes #1709