Report Map Fix