DEP-65 fix