Add some fix code