Fix disarm