Fixed APPM-8 & APPM-4