AAAAhhhhrrrggrgrggrgr

premature and wrong patch, sorry.  Again against master: