Problem with A, this is workaround for #1