Adding the Dependency tracket after SetObject(). This is a fix from mainline