Fixed popping at edge cases.