Patch for empty string handling