Bug fix arm64