resolved endless looping