Added fix for s390(x) and ppc64