#9979 simplified code