fixes #4574

pull request as asked for #4574