Fixes #1631