[#76452620] further enhancement