ArrayMap fix