Fix the double inclusion bug