Bug fix - stack overflow.