Fixed bug with nil ValueReferences