Fix the codes