Fixes #1695