Added additional check for the conditional AMD logic