Fixed pop bug