Fixed another pop map bug