fix: mismatch with arch enum and move misplaced code

fix: mismatch with arch enum and move misplaced code #842