manually merging typofix from julapy