change __class__() calls