Bug 996675 - Fixed current calculation