NT 17-20 bugfixed