Fix for perfs