Fix 3 for #15