Another calc fix