Fixed a bug where da21 raised an exeption