Fix for s390(x)