Fix the broken