Support old 1.7 links