fixes #2307