Fixes #1708