try to fix errors in s390x