fix arm/disarmed bug