Fixes #1732