Command payload length fix. Work on System.