remove fix for `calculate`