Added RNH port current handling