(fixes #2754)