Fix map command EOF