fix nat now accepts a callable