Add temporary work around for URL bug