fix bugs in angel