fixed the issue in popup