Implemented Collin's Map Fix.