Added old 1.2.5 code