Fixes #1635