Fix to support relative URLs