Bugfix: Fixing NR racecondition