Make the branch compile with fixing following error: