Sigh, undo 'fix' that created infinite loop