Fixed map output for non-typed maps