Fix up something that needed to be done with map evalling for awhile