Fixed pop map bug