make AGP transform mapping more robust