Fixes #1730