DEP-68 fixed bug