Performance Fix.