Bug Fix

New code will stop StackOverflowErrors that I foolishly created.