Fix map store processing order

Fix map store processing order