Correction of overload issues