fixes #5472