Fix for expand root url issue