Fix 4 for #187