Fixed serpent backwards-compatibility