fixed issues with dexgaurd