Overload fix