FIx for jb_fix_names