Merge "Fix OverLimit's message"