Fixed Popup not loading correct values when reloading