fixed pop bugs