Fixes #2879