Fixing up passing current