Current calculation fix