Fix 2 for #187