fix architecture independent