move fix code to config files