Fix for "Command too long" issue