Fixed value retrieval

TODO: fix for real from config