fixes #5327