Fix the double signature issue