re-implement normal behaviour because of remove of CMS-Redirect
re-implement normal behaviour because of remove of CMS-Redirect