Fix of issue #2657: NX-17 charge rifles now work (more) properly.