Fixes #2810