Fix organize class callback