might fix more issues with loading and getting values