Fixed redirect and removed regexp depend