fixes #2781