Fixed the value retrievals