Fixes #2805