More fix on __new__.