Chargen Fixes #28