Fixed major bug from Calcs