Fixed with statements resolving values to actual objects instead of references.