fixes #4574