Fmaps generation bug fixing in progress