fix bugsnet #66591 and github #60