Fixes #1700