Fixes #1714