Fix 69 and 71