Mando attempted fix