fixed SafeActions