Fixes #1698