Fixed bug with single index maps from new processing