Fixed issue with pop-up not showing some data