Updated patch for Issue#12