fixes #2686