removed safe flag