Changed so no infinite loop!