another calc by class fix