Additional safe deletion fix (OMS-267)