improve speed for FP maps
