infinite loops fixed \o/