fix chargen for more compliance