fixed pop issue