Fixes #2622