another calc fix attempt