90 xj 4.0. Runs very cool if moving at any speed. Stop at a light for a little while and it starts to overheat. If I put it in neutral and raise the rpm's to about 1000 it will cool right off. I have a electric fan that I control with a switch. It seems to make no difference if that is on or not. Would this most likely be a fan clutch?