Fixed bugs in computing data which is not already in files