Temp fix performance bug