Hmmm... running into the same problem myself.
I guess I'll try the diaga spam method next time indeed...