fix for the performance