final 12.9 fix