Adding substution of source objects in cases where source object is a wonky proxy type and needs to be replaced with the real version. Closes #409