Fix map isolation
Fix map isolation