Fix 3 for #187