Fix push/pop issue when holding on to self during fetch