fixed bug in popup