Fixes #1433