12.25 fix