Fix target architecture issue