Fixes #2880.