fix to support different URLs