GNR-16 abstract code bugfix