fix - An apparent infinite recursive loop