Fixed for nitrogen 2.3.0-beta4
Merged with main Nitragen branch