Fixed bug when setting wrappedvalue of new object, still a hack...