Fix Performance Problem

Welcome, TPS!