Enhance fix of 0b81a300d9e7cf78b6bc11d8c870f57fa81fcdc4.