Fixes #1671