Fixes #1681