calculation fix again