fixing calcs