Fix the bug again