fix infinite loop. why wasn't this pulled in
from master?