Fixes #2842