more patching to fix ClassDefNotFound