Fixes #1710