Fixes issue #2027 

put & remove map store execution order.