Changed to safe  for #27