fixed
simplify computation