Fixed M2M clause rewriting

Signed-off-by: Tom Wright <tom@inflatablecookie.com>