Fix the Url Parsing problem