I slightly changed the arch for bug #7547.