Adjust to work with 1.4 obj de-serialization