added SAFE_NAME flag