I think this fixes #1031.