fixed name resolution issue with waddiff