Fixes #1705