Fix for silly bug referencing uninitialized vars