Fixes #1690