Fixes #1633