Fix command length restriction