Fix infinite recursion

Alternative attempt at fixing the infinite recursion problem (#42).
You're passing `**kwargs` on L252. Does that need to be passed there, if so please update the signature and use them appropriately here.