Actually fixed calculate