Fixed issue: Removed deprecated option safe