Fix to handle the new dic