Fixes #1762