Fix the problem due to removal of Focal

Fix the problem due to removal of Focal