Think that should fix the ntz bugs.