Super Bug Fixed (infinite loop)