Fixed a weird bug where an object has to be saved, modified, then saved. Does not smell right but it works.