Fixed forever loop