fix to 'that' binding