OSNG9 - increased rule compliance