same as yesterday, this shouldn't use __class__