fixes #1054