Fixed a bug wherein complex objects where not represented correctly when model was changed.