Fix 37 & 38