This same problem already existed at the same place in ED, actually.