Clear calc fix. Duplicate class adding fix