Fixes #1747