fixes #1035