fixed calculate class