Fixed infinite loop?