Patch Fix following the Content Update