Fixes #1759