fix for APPM-2