Fix Calculate call pattern