fixes #4639