Patches to current calculations (bug fix).