Fix redundant system bug causing major slowdown.