Now the normalization of currents should be correct. Please test before merging!