fixes #2685