add workaround for #34 to AW