1b89d83 Fixes #2721