Add checks if fields are zero before calculating