GNR-2 bugfix