Block patch for 1.2 already fixed in trunk, but in another way