Patch for case #256