Fixing a problem related with performance.