Bugfix in jb_fix_names