Fix 1 for #187