#87 ARM bug fixed