Fixing the content router