[fixes to wnf #127