Fix ASI and ASPA