Fixed popup problem