Fixed bugs in DA