Fix calculate