Added final fix