fixes #4620