Bugfix DAA - TODO: Add unittests for it!