Customer final fix