fix for APPM-3