Shouldn't we be doing ENSURE_CLASS here ?