Last 2/3 fix