Fix 21 & 24 issue