As m2m adds through prefetching with a call to extra(), fixing extra() is enough.