Ensure recursive calls & function keys ok.
Release 2.1.1