Resolving #4638.