my entire harness was corroded and i had this same problem, replaced the harness during the motor swap and didnt have anymore problems.

also change the fuel filter.