24, 21 fix