fix derp that led to NPE's and AIOOB's