Fix bug: Loop forever