fixes #2570