Fixes #2880