Fixes #2820