Fixed issue after performance tuning