*Fix deprecated safe option