Fixed pop return scope