fix for NAF Links