Fix FromObject