SERVER_ARCH fix