Keep method signatures the same 

Apologies, you merged this in earlier, but my last PR reintroduced this bug. Could you please merge this in again ?
This removes STRICT warnings. 

Thanks!