Fixes #2826