Fixes #1706