Fix 2 for #2