This patch fixes the following two problems: #264

Job	Run time
build-native-ubuntu-latest-gcc	3m 2s
build-native-ubuntu-latest-llvm	3m 54s
build-native-ah-ubuntu_22_04-c7g_2x-50-gcc	2m 36s
build-native-ah-ubuntu_22_04-c7g_2x-50-llvm	3m 17s
test-native-ubuntu-latest-gcc	9m 20s
build-armhf-gcc	1m 58s
test-native-ubuntu-latest-llvm	7m 24s
build-armhf-llvm	2m 0s
test-native-ah-ubuntu_22_04-c7g_2x-50-gcc	2m 40s
build-ppc64el-gcc	3m 7s
test-native-ah-ubuntu_22_04-c7g_2x-50-llvm	2m 25s
build-ppc64el-llvm	2m 44s
build-s390x-gcc	2m 32s
build-s390x-llvm	2m 20s
build-riscv64-llvm	2m 36s
test-${{ matrix.arch }}-${{ matrix.compiler }} (qemu_cpu: "${{ matrix.qemu_cpu }}")	0s
	51m 55s

Provide feedback