Another perf fix, sheesh!