Feature/adwd 1031

Temporary bugfix