Fix 143 and 144