Twice.....wasn’t it? In the same episode. (or is my memory fading...)
Griffith was a great show.
I believe you are correct. (but your memory could still be fading)...how about this... I’m fairly sure it was Larry Hovis’ car that Goober was trying to fix. (Carter from ‘Hogan’s Heroes’)
...way too much time on my hands.