fix safeOPs