Fixed auto-arm issue