Pop up bug fixed