Fixing AMD calls