Fixed Performance Bug