fixed problem with popup