fix my pull, go ahead and fix jim's too