fix map and finx
fix map and finx