Added fallback for direct url