Working on tracking down bug