Fixes #2421